Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #957, move async console option #959

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Puts the "async" option into the shared layer instead of the impl layer.

This allows both options to be coverage tested and also allows a bit more of the logic to be common instead of duplicated in the 3 implementations.

This also adds back an osconfig option to allow the user to elect this mode at configuration time.

Fixes #957

Testing performed
Build and sanity check CFE with OSAL_CONFIG_CONSOLE_ASYNC set each way
Confirm coverage test also exercises both runtime paths, regardless of compile time config.
Confirm (via debugger on native build) that when OSAL_CONFIG_CONSOLE_ASYNC is set false, the extra utility task is NOT spawned.

Expected behavior changes
No externally-visible impacts
Gets better path coverage on both modes of operation

System(s) tested on
Ubuntu 20.04 (native)
RTEMS 4.11.3 (QEMU)
VxWorks 6.9 (MCP750)

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Puts the "async" option into the shared layer instead of the impl layer.
This allows both options to be coverage tested and also allows a bit more
of the logic to be common instead of duplicated in the 3 implementations.

This also adds back an osconfig option to allow the user to elect this
mode at configuration time.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 12, 2021
@skliper
Copy link
Contributor

skliper commented Apr 12, 2021

Add flag to cfe/cmake/sample_defs/default_osconfig.cmake?

@skliper skliper added CCB:2021-04-14 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 14, 2021
@skliper
Copy link
Contributor

skliper commented Apr 14, 2021

CCB:2021-04-14 - APPROVED

@astrogeco astrogeco changed the base branch from main to integration-candidate April 28, 2021 13:05
@astrogeco
Copy link
Contributor

@jphickey can you resolve the conflict here ?

@astrogeco astrogeco merged commit c518e3f into nasa:integration-candidate Apr 28, 2021
@astrogeco
Copy link
Contributor

astrogeco commented Apr 28, 2021

I think I got it, see c518e3f,

os-shared-printf.h was the culprit

jphickey pushed a commit that referenced this pull request Apr 28, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 28, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 29, 2021
Combines:

nasa/cFE#1431
nasa/osal#975
nasa/sample_lib#61

Includes:

nasa/cFE#1379, memory pool pointer type
nasa/cFE#1289, ES child task functional test
nasa/cFE#1289, typo in macro name
nasa/cFE#1286, Remove broken BUILDDIR reference
nasa/cFE#1305, remove option for "osal_compatible"
nasa/cFE#1374, CFE_SUCCESS constant type
nasa/cFE#1316, Remove Unused Error Codes
nasa/cFE#1370, better warning about malformed startup line
nasa/cFE#1373, check status of call to `CFE_ES_CDS_CachePreload`
nasa/cFE#1384, update documentation for `CFE_ES_DeleteCDS`
nasa/cFE#1385, exception logic when app/task is not found
nasa/cFE#1372, error if alignment size not a power of two
nasa/cFE#1368, remove unneeded CFE_ES_SYSLOG_APPEND macro
nasa/cFE#1382, improve documentation for resourceID patterns
nasa/cFE#1371, assert `CFE_RESOURCEID_MAX` is a bitmask

nasa/osal#972, update documentation for read/write
nasa/osal#966, add "handler" feature to utassert stub API
nasa/osal#953, Adds local makefile and bundle/local unit test actions with coverage verification
nasa/osal#971, socket accept using incorrect record
nasa/osal#959, move async console option

nasa/sample_lib#60, replace direct ref to ArgPtr with macro
@jphickey jphickey deleted the fix-957-consoletask-async-option branch April 29, 2021 13:14
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Impossible to test OS_CONSOLE_ASYNC false case
3 participants